From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Tue, 31 Jul 2007 13:59:29 +0000 (+0000)
Subject: Adding new parameter $8 with the begin of a block to 'blockedtext' and 'autoblockedtext'.
X-Git-Tag: 1.31.0-rc.0~51915
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=4158c5593d4383be8734d457b0a49aba2738636d;p=lhc%2Fweb%2Fwiklou.git

Adding new parameter $8 with the begin of a block to 'blockedtext' and 'autoblockedtext'.
I think there is no need for new message name to not break existing localizations.
It was a request of the German OTRS team which handles a lot of block complains.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 894134a8af..39d713187f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -745,6 +745,7 @@ class OutputPage {
 
 		$id = $wgUser->blockedBy();
 		$reason = $wgUser->blockedFor();
+		$blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true );
 		$ip = wfGetIP();
 
 		if ( is_numeric( $id ) ) {
@@ -784,8 +785,8 @@ class OutputPage {
 		 * This could be a username, an ip range, or a single ip. */
 		$intended = $wgUser->mBlock->mAddress;
 
-		$this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended ) );
-		
+		$this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ) );
+
 		# Don't auto-return to special pages
 		if( $return ) {
 			$return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL;
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index caf0c8aee5..290d700081 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -937,8 +937,9 @@ format. Please enter a well-formatted address or empty that field.',
 
 The block was made by $1. The reason given is ''$2''.
 
-Expiry of block: $6<br />
-Intended blockee: $7
+* Begin of block: $8
+* Expiry of block: $6
+* Intended blockee: $7
 
 You can contact $1 or another [[{{MediaWiki:grouppage-sysop}}|administrator]] to discuss the block.
 You cannot use the 'email this user' feature unless a valid email address is specified in your
@@ -949,7 +950,8 @@ The reason given is this:
 
 :\'\'$2\'\'
 
-Expiry of block: $6
+* Begin of block: $8
+* Expiry of block: $6
 
 You may contact $1 or one of the other
 [[{{MediaWiki:grouppage-sysop}}|administrators]] to discuss the block.